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