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

Change-Id: If9bc4be67f42303e83ffd97152f1c377f066acb6