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

Change-Id: I26186c421f3c0fb41dd4628ebcf23b511251a1ff