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

Change-Id: Id5508a3f153a48cf18fdc492d90d8593a6306b52