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

Change-Id: Id53f7fdca63df3b038de1b47aeb7aa728725ebbb