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

Change-Id: Ice0a948e87c452638f3dbf46d37e8649a1b4e9e2