Merge cherrypicks of ['googleplex-android-review.googlesource.com/27163475'] into sc-v2-platform-release. Change-Id: Ifb40b6b9f9cafec5a6b31fe006dbd44e1f01ba91