Merge cherrypicks of ['googleplex-android-review.googlesource.com/20290611', 'googleplex-android-review.googlesource.com/22633472', 'googleplex-android-review.googlesource.com/22438868', 'googleplex-android-review.googlesource.com/22625072'] into sc-v2-platform-release.

Change-Id: I681ca52ebd4e8fcb61d8ac0f853d13340fe5c9b0