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

Change-Id: I820c1a0d6313a4f88cf209a9525c906bc5914c36