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

Change-Id: I94708503124b51398c9bc606a5ba70dd5fe1c7ce