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

Change-Id: Ia6f7c581ed227de0baa5dd264b4b3b56c87f0cd7