Merge cherrypicks of [20108128] into tm-d1-release.

Change-Id: Ie27c1db3198c38a7cf346ec46b2e1125b4d9c917