Merge cherrypicks of ['partner-android-review.googlesource.com/3026452', 'partner-android-review.googlesource.com/3036776'] into sparse-12859539-L51200030008761432. SPARSE_CHANGE: I8e03b1f7628f931d043966aee5b0438afa910b3d SPARSE_CHANGE: Ie75ec6cc692c7ea3271854e09bbe3740172bedfb Change-Id: I45a9500a8e0498490f5b8a26ea7256b8b0a9f27f Signed-off-by: Coastguard Worker <android-build-coastguard-worker@google.com>