Merge cherrypicks of ['partner-android-review.googlesource.com/3094143', 'partner-android-review.googlesource.com/3127076'] into sparse-13097222-L05900030010345839. SPARSE_CHANGE: I7eef00d270a25dd6e0dad656732e710846db04b2 SPARSE_CHANGE: I52a33a646f656e2f6e957366e58bb34b4030a4e3 Change-Id: I67ae0f3b374c1c93c4e288a42cdcb2fda689202d Signed-off-by: Coastguard Worker <[email protected]>