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

Change-Id: Id5600ef5918c37625a37bd1dfe96864af93bd018