Merge cherrypicks of ['googleplex-android-review.googlesource.com/24625436'] into tm-qpr3-release. Change-Id: Ie21ef66f76c0d7b86bdf088ce1d071863505da65