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