Merge cherrypicks of ['googleplex-android-review.googlesource.com/28851163', 'googleplex-android-review.googlesource.com/29055136', 'googleplex-android-review.googlesource.com/29056665'] into security-aosp-tm-release.

Change-Id: I02bf1303014f907c832700142ac64381d84d548e