Merge cherrypicks of ['googleplex-android-review.googlesource.com/33315058', 'googleplex-android-review.googlesource.com/34095037'] into tm-platform-release.

Change-Id: I93ac45f59c48d1dee6fb6f2a2f0e7c7756548ca5