Merge cherrypicks of ['googleplex-android-review.googlesource.com/22977056'] into rvc-platform-release. Change-Id: I3d5066e24fa323a7e09f08808ad101d58975ecc3