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