Merge tag 'v3.4.113' into cm-14.1

Change-Id: Ifa814958fd557299a5442731fc22fcb62139898b