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

Change-Id: I2a6505e133849556f7984b435ac1ec370c285ab5