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

Change-Id: I2950ddd48cba1b2fb512236355c530b25136d59e