Merge cherrypicks of ['googleplex-android-review.googlesource.com/23914073'] into tm-qpr3-release.

Change-Id: If3738785f1fe63d9a78488032c240f4d909b87c0