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

Change-Id: Iba513e117f9749ea342aa573120c758f4a14ba68