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

Change-Id: I82a4fe563ed2cb4a8554d4df2a4fa6bbd08f8216