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

Change-Id: I50d132c50efaea9ebbb7d74ef4ec52bc26f85f2c