Merge cherrypicks of ['googleplex-android-review.googlesource.com/34375480'] into security-aosp-tm-release. Change-Id: Ic81c54c91383c9b12b4c8a231fe1318a36301ec3