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

Change-Id: Ie41d05b1b7fb4a4a9a0ecf317dc31b6f044a9d84