Merge cherrypicks of ['googleplex-android-review.googlesource.com/30772450'] into sc-platform-release. Change-Id: I512a7abf526e5dc1645e07bf6118c4b122b59ff1