Merge cherrypicks of ['googleplex-android-review.googlesource.com/25578941'] into sparse-11186256-L15500030000696031.
SPARSE_CHANGE: If7b00a5ddd5137a8d41f54454665eb3cff320227

Change-Id: I40d9d18d3e8a6391a3c46e76978ca90322cab2ca