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

Change-Id: I98109b13b97680e076cddf6b5971d831f380ee28