Merge cherrypicks of ['googleplex-android-review.googlesource.com/20169890', 'googleplex-android-review.googlesource.com/22188944', 'googleplex-android-review.googlesource.com/22188946'] into rvc-platform-release.

Change-Id: I4de59edcfcd9eb2dcc60652d2b1da9b2b73ede22