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