Merge cherrypicks of ['partner-android-review.googlesource.com/3026195', 'partner-android-review.googlesource.com/3036394'] into sparse-12859539-L51200030008761432.
SPARSE_CHANGE: I0b08d56a19b7e10c297fce877e332eb33218fd49
SPARSE_CHANGE: I78a22ccf12ab23b51a641b650b1bc0faf614c47d


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