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

Change-Id: I95de329ec24e9d38c8605b63047e81bd4ac44e24