Merge cherrypicks of ['googleplex-android-review.googlesource.com/22598537', 'googleplex-android-review.googlesource.com/22603500'] into tm-qpr3-release.

Change-Id: Iae0b3c09526d92bcb7df495610cd8ad8c4639db3