Merge cherrypicks of ['partner-android-review.googlesource.com/2928766', 'partner-android-review.googlesource.com/2928284'] into sparse-12319158-L27000030006374856.
SPARSE_CHANGE: I7402d11f2af08b92073ed6a857d581823db075e2
SPARSE_CHANGE: I4f2607c0a17a8cee596937fba73d3e773c31ee7f


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