Merge cherrypicks of ['googleplex-android-review.googlesource.com/27059672', 'googleplex-android-review.googlesource.com/27059673', 'googleplex-android-review.googlesource.com/27059674'] into security-aosp-tm-release.

Change-Id: I258b76a297137d025a8883a621164a6301aeed66