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

Change-Id: Ia450b748e5081b9c1fce59fe2b055818fae282ec