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

Change-Id: Ia5c1e8d120358a2e89f900296d39f1c76cb1954f