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

Change-Id: I35be7abef7e5408bff421f9ff6552317156e05dc