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