Merge cherrypicks of ['googleplex-android-review.googlesource.com/21548673', 'googleplex-android-review.googlesource.com/21548674', 'googleplex-android-review.googlesource.com/21548675'] into rvc-platform-release.

Change-Id: Iab49ad175447a3b70157314f2dca33fff0dcfc41