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

Change-Id: I0cd989207e66d0d0296f5a38df5489f9dc02f166