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

Change-Id: Ied462348867d3ba9fafb143886287edbde3fa4f9