Merge cherrypicks of ['partner-android-review.googlesource.com/3025791', 'partner-android-review.googlesource.com/3036087'] into sparse-12859539-L51200030008761432.
SPARSE_CHANGE: I6ec06d6ef71f188b6332fc8991c3f7964121eaf2
SPARSE_CHANGE: I3cbe0aa8ccc36ea9201cafb4cfec42a2ee1e196e


Change-Id: I9dc1685c13cfe990aa1528c2dd9e26be7577a8e7
Signed-off-by: Coastguard Worker <[email protected]>