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

Change-Id: I103156b6a01f8860176b658090a3a0a06dfa9e21