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

Change-Id: If4870b0307cdd13751d2bb0e4539e3d41dc54887