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