Merge cherrypicks of ['googleplex-android-review.googlesource.com/27145126', 'googleplex-android-review.googlesource.com/27163476'] into tm-platform-release. Change-Id: I0c3cc28c6a48e1ec6eb0a2903f39efa84bd853be