Merge cherrypicks of ['android-review.googlesource.com/3157038'] into sparse-12025142-L97900030004927110.
SPARSE_CHANGE: I69a3f8d2fd2d7dc157d14a0f743650881eec473d

Change-Id: I93975d82e4f6120de6ad3fd5bf395d35cd14ea09