Merge cherrypicks of [19135348] into tm-release. Change-Id: I01d9207b01534712c350b7338c892dc2d6a42508