Merge cherrypicks of ['partner-android-review.googlesource.com/3071065'] into sparse-13094706-L06600030009744049. SPARSE_CHANGE: I4107ed9c78854379dd09c2a457f69dbbd3ea182b Change-Id: I1be75462eda5780882811c4866a461d20cdf033c Signed-off-by: Coastguard Worker <[email protected]>