Merge cherrypicks of ['googleplex-android-review.googlesource.com/21328340', 'googleplex-android-review.googlesource.com/21551540'] into tm-d3-release.

Change-Id: I6054c78719f8ca7ecef441d09de60412fb730eaf