Merge cherrypicks of ['googleplex-android-review.googlesource.com/23809632', 'googleplex-android-review.googlesource.com/23861840', 'googleplex-android-review.googlesource.com/24425526'] into tm-qpr3-release.

Change-Id: Ib16f835953b4d5b1fe4c5756c5e3fd5eacf29993