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

Change-Id: I90cb8e2ff926503ac3e2fb219794e6e982f6e737