Merge cherrypicks of ['googleplex-android-review.googlesource.com/21680607'] into sc-v2-platform-release.

Change-Id: I9a54fed04d964cfe1ea94e5bc73df452a4b0785f