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

Change-Id: I02f50d86fda840446c768d06878c2b8642ab2f31