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

Change-Id: I509fa36c23d287f6ae7b4c6d65e75ffa8ab96b47