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

Change-Id: Ie80b269ec42e9157d9173552a29ec94a9f7a69de