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

Change-Id: If7dada691e4f23d27370f4395ce9a6f8f29868ed