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

Change-Id: Iab636e28108eef5fa3970aee4cee7693b268d9a0