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

Change-Id: Iddfdba7cca612dedb5a156f89fc77c27e6f462f4