Merge cherrypicks of ['googleplex-android-review.googlesource.com/34941126'] into security-aosp-tm-release.

Change-Id: Ie3b3313da2391c434af551e1caffaf26a9032fb5