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

Change-Id: I10e31e15b8d55c3238e67af273efa3c763d9a184