Merge cherrypicks of ['android-review.googlesource.com/2818362'] into sparse-11273935-L06700030001234825.
SPARSE_CHANGE: I9ceb89582bc996c754cb7a6be76ba45c556db962

Change-Id: I1f9aa295564f281030c9785956f9dbe3946ef67f