Merge cherrypicks of ['googleplex-android-review.googlesource.com/21548677',...

Merge cherrypicks of ['googleplex-android-review.googlesource.com/21548677', 'googleplex-android-review.googlesource.com/21548678', 'googleplex-android-review.googlesource.com/21548959'] into security-aosp-rvc-release.

Change-Id: I1e1337f99b2114d34f51e4f98ba2a4b6b3294bc5