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