Merge cherrypicks of ['googleplex-android-review.googlesource.com/26866467', 'googleplex-android-review.googlesource.com/27576515'] into sparse-12231197-L09800030005829477.
SPARSE_CHANGE: I47b8b72a5a5c4098b46f0b5dbbf0654513b03aee
SPARSE_CHANGE: If4ab3030cfa1f9faed5d099077e5e3bab2cba622

Change-Id: Id1d5d87afcb072666e37b4ad1fcd4297e19e832e