Merge cherrypicks of ['googleplex-android-review.googlesource.com/31836022'] into sparse-13083703-L97000030009736637.
SPARSE_CHANGE: I6d7294b535041783b420b818ef1771b15ea75722

Change-Id: I782ff694b9298d1aae9dee41be85aaf788a8aa75