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

Merge cherrypicks of ['googleplex-android-review.googlesource.com/29465523', 'googleplex-android-review.googlesource.com/29467145', 'googleplex-android-review.googlesource.com/29465857'] into security-aosp-tm-release.

Change-Id: I7ec56f788f831e26b29934dbb4983a60fe0165c5