Merge cherrypicks of ['googleplex-android-review.googlesource.com/25444044', 'googleplex-android-review.googlesource.com/25262200'] into security-aosp-sc-release.

Change-Id: I4b736e96db83b31899bf0984f0010b28f84ff626