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

Change-Id: Ic34947b8b28a34414c358b7356863f043d09f420