Merge cherrypicks of ['googleplex-android-review.googlesource.com/23231862'] into tm-qpr3-release. Change-Id: Id91cf7096f5e4228e7ea19c26a30ba0a3f629d82