Merge cherrypicks of ['googleplex-android-review.googlesource.com/27403219'] into udc-platform-release. Change-Id: I7299445ab093223d85cdeb20bbc0240d09a09d7c