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

Change-Id: I553fa7cb1e803a1edbd066f15e159dd5b8752136