Merge cherrypicks of ['partner-android-review.googlesource.com/3127077'] into sparse-13155558-L56800030010349309. SPARSE_CHANGE: I27927e0e69399887b252ef165492f967c4023953 Change-Id: I61405395629f5a05832ef5fddfa5c39fe87ab10c Signed-off-by: Coastguard Worker <[email protected]>