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

Change-Id: Iaf58c3d614d47fad8a3e7d6faf2af61f19e62016