Merge cherrypicks of ['googleplex-android-review.googlesource.com/25546839'] into mainline-extservices-release. Change-Id: I0d4565e79232627ec8c83e3fa57d35b3f580d389