Merge cherrypicks of ['partner-android-review.googlesource.com/2926709', 'partner-android-review.googlesource.com/3004348'] into sparse-12859464-L96400030008637458.
SPARSE_CHANGE: I5b7db63b70ab65c6fa5434ad2eacf66fad0ee3b4
SPARSE_CHANGE: I4451084eb0f1054124f56123fc53b2f7bf78d8b9


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