Merge cherrypicks of [19562478] into tm-d1-release. Change-Id: Ie61a039f9e9e6350647bce826e921a8dc48995c6