Merge cherrypicks of [19750317, 19879944] into tm-release. Change-Id: I4934ab7a0d304ccb2ffa14ed746b3728b6637e1a