Merge cherrypicks of ['googleplex-android-review.googlesource.com/20704230', 'googleplex-android-review.googlesource.com/20727250', 'googleplex-android-review.googlesource.com/20665167', 'googleplex-android-review.googlesource.com/20871682', 'googleplex-android-review.googlesource.com/20802849'] into tm-d4-release.

Change-Id: I118ae9a2a841b6d096a202b940c6f03236ce6395