Merge cherrypicks of ['partner-android-review.googlesource.com/2989356', 'partner-android-review.googlesource.com/2989775'] into sparse-12739144-L73100030008198611.
SPARSE_CHANGE: I85aa69780e04c3d171cad74ef909ef12e3a67b3b
SPARSE_CHANGE: I088217ecf9fb30813b8f338fdfad315181ba9e4e


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