Merge cherrypicks of ['partner-android-review.googlesource.com/3026196'] into sparse-12859539-L51200030008761432. SPARSE_CHANGE: I7b2eb2f1785ce99abc210e8e34e26787e453f9d3 Change-Id: Ief47cb93c4b2c82203d2676c86734b11e47e1a2c Signed-off-by: Coastguard Worker <android-build-coastguard-worker@google.com>