Merge cherrypicks of ['googleplex-android-review.googlesource.com/25177019'] into sparse-11010452-L16800000963750677.
SPARSE_CHANGE: If8f16626a5e13f98e81ff0833a60888efe9cddcd

Change-Id: Ib16296ddfee02d3f1712abff46c775c615d08202