Merge cherrypicks of ['googleplex-android-review.googlesource.com/27975021', 'googleplex-android-review.googlesource.com/30596052', 'googleplex-android-review.googlesource.com/30596048', 'googleplex-android-review.googlesource.com/31157005', 'googleplex-android-review.googlesource.com/31106430', 'googleplex-android-review.googlesource.com/31091509'] into sc-platform-release.

Change-Id: I2c7aa3b44f08ad70e548e583b0a1c766cdfa1f6e