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