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

Change-Id: I36e41729be41b2027c946cec343c47867a7c8284