Merge cherrypicks of ['partner-android-review.googlesource.com/3073783', 'partner-android-review.googlesource.com/3115386', 'partner-android-review.googlesource.com/3135923'] into sparse-13096118-L48600030010658438. SPARSE_CHANGE: I35016e12b7bbaba82b4ab8763a396e4b7be083a8 SPARSE_CHANGE: Ieec6f62e68a588ca02627424599562a5de292d7f SPARSE_CHANGE: I3fa93bdc763473ea873126b2d716327207844b9f Change-Id: I25de49816edf4375732d282189194fd592dcd778 Signed-off-by: Coastguard Worker <[email protected]>