Merge cherrypicks of ['partner-android-review.googlesource.com/3018051'] into sparse-12817294-L64300030008461038. SPARSE_CHANGE: I10b9fc09fe21252c4a3efcb9103ae7cd93996e08 Change-Id: Ieef86b64dcf75b022ee9057008bdcdbd00ac02cb Signed-off-by: Coastguard Worker <android-build-coastguard-worker@google.com>