Merge cherrypicks of ['googleplex-android-review.googlesource.com/28807645', 'googleplex-android-review.googlesource.com/28806455', 'googleplex-android-review.googlesource.com/28806520', 'googleplex-android-review.googlesource.com/28808041'] into sparse-12231197-L51300030005825607. SPARSE_CHANGE: I0fd5f194fcb5d529fcbba4dfa524b23e24fb35e1 SPARSE_CHANGE: Ib060e30902cdd06922abf36158e44b958a9f8412 SPARSE_CHANGE: I8ae5e6aba99c0d737a571d5d21f9361402c552e5 SPARSE_CHANGE: I9d1a7d585cb5e7cbe8916532af93ed6acd98b135 Change-Id: Icae46c025f21d56cf9c9c5658eb8ec3ab0811383