Merge cherrypicks of ['googleplex-android-review.googlesource.com/20918485', 'googleplex-android-review.googlesource.com/21237096'] into tm-d4-release.

Change-Id: I45ad87e8b3050094386862631563b3ae229de50e