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

Change-Id: Idea6efd3593ae2ed538ff9283cdc194af03fe34f