Merge cherrypicks of ['googleplex-android-review.googlesource.com/21076509', 'googleplex-android-review.googlesource.com/21162824'] into tm-qpr2-release. Change-Id: I0ac249f67a935142932d6632acb18d7c2cdecd6e