Merge cherrypicks of ['googleplex-android-review.googlesource.com/22896125'] into tm-qpr3-c-release.

Change-Id: I11628b86f62a56bd99b8979ac77d9b137aedb6ba