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