Merge cherrypicks of ['partner-android-review.googlesource.com/3016323'] into sparse-12817294-L64300030008461038.
SPARSE_CHANGE: I1fba3020c822257fd21ba7663cc7a46da75c6cee


Change-Id: I68827508b17d4a5aae1cd943e4585586a14bcf66
Signed-off-by: Coastguard Worker <android-build-coastguard-worker@google.com>