Merge cherrypicks of [19037861] into tm-release. Change-Id: Icabf431dfa8f538e223b05dec2f02d79d105a04b