Merge cherrypicks of ['googleplex-android-review.googlesource.com/27163475'] into sc-platform-release. Change-Id: I29a1246c6e8e56d29dade7a0d11057f0c59f72d5