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

Change-Id: I0af04bf4adc8cb49b9ab0ebc98446cea976cefeb