Merge cherrypicks of ['googleplex-android-review.googlesource.com/22865717', 'googleplex-android-review.googlesource.com/22931281'] into tm-qpr3-c-release. Change-Id: I6e29173bcb1e1b7e66724dee3b6b9f59e7508767