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

Change-Id: Id41d981a182dc026f6ac87b419c29729c4189245