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

Change-Id: I889b6b456dc15e43b25991aebd324298b3408c17