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

Change-Id: I0cdd201e2fc154cbeaada0769f1df50a9dde49f2