Merge cherrypicks of ['googleplex-android-review.googlesource.com/23635001'] into tm-qpr3-c-release. Change-Id: Id0a07da346a448e00e6c31036ec4206506aaa0a8