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

Change-Id: Id9262b2d530230fafd7b2532910b773bf559ec00