Merge cherrypicks of ['googleplex-android-review.googlesource.com/28535949'] into sparse-12210230-L62100030005810919.
SPARSE_CHANGE: Icb07acd88138a7519f73d3df9ab323220d99dfe7

Change-Id: Ic0d37965e08a6d8be0f570452189d7f8566e3299