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

Change-Id: Ifa54765e4ef827bef923d1f33f595e78a57e5cdd