Merge cherrypicks of ['googleplex-android-review.googlesource.com/24956689'] into rvc-platform-release.

Change-Id: Iab250cc84d0cb137f46da1e493a1023561b45c5e