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

Change-Id: I90a371848090a8afb20d3c068340e1f553bb7e7f