Merge cherrypicks of ['googleplex-android-review.googlesource.com/27030093'] into sparse-12192237-L48700030005686605.
SPARSE_CHANGE: Ibec4f0c908089ca4304e59e9d37529fa2d4fa40d

Change-Id: I88c3fb94518d5f1c5ac51b1cc12f14ddada0dac0