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

Change-Id: I404a82665611c30bcd2ff451fa9facc335358f50