Merge cherrypicks of ['partner-android-review.googlesource.com/3037032'] into sparse-12896835-L49000030008918233.
SPARSE_CHANGE: I98c1a29f9fca799d59f3e26931eab44ce10088d7


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