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

Change-Id: I32795091de3cf37870c2139b6fccb6072fe627c1