Merge cherrypicks of ['googleplex-android-review.googlesource.com/29322003', '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-v2-platform-release.

Change-Id: I35fff9a029c17e0c64304c9b5d0be7cf0ce8df7e