Merge cherrypicks of ['googleplex-android-review.googlesource.com/22246438',...

Merge cherrypicks of ['googleplex-android-review.googlesource.com/22246438', 'googleplex-android-review.googlesource.com/22935398', 'googleplex-android-review.googlesource.com/22860951', 'googleplex-android-review.googlesource.com/23053887'] into tm-qpr3-c-release.

Change-Id: I2ee77938260909bb96453c636fff8a8ea0f9bf57