Merge cherrypicks of ['googleplex-android-review.googlesource.com/25102282', 'googleplex-android-review.googlesource.com/26225135'] into sc-platform-release.

Change-Id: I93816d74ad7902c5043bd940dc53545d71dcbee5