Merge cherrypicks of ['android-review.googlesource.com/3380291'] into sparse-12723046-L97500030008075518.
SPARSE_CHANGE: I69e5f8879119f17ffa6740e3d67c437fe7fa938e

Change-Id: I362ba99872c2fbdae3ce6c9183dca89d6e99c314