Merge cherrypicks of [19097922] into tm-release. Change-Id: Icb0d32f00626b62e7fb7be99e86a6fe5563e2cde