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

Change-Id: I43c55c82c50dfffdc0c9e154546fea4c404eef07