Merge cherrypicks of ['googleplex-android-review.googlesource.com/21548274', 'googleplex-android-review.googlesource.com/21548275', 'googleplex-android-review.googlesource.com/21548276'] into sc-platform-release.

Change-Id: I01776a04f4b9c84e83d98611fe7f513ee1f2fa65