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

Change-Id: I2af07f0c43477cf6f8937e03484336306c34de7e