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

Change-Id: If42d1b862cb79cb667e29fcf1af7b42a3a331379