Merge cherrypicks of [19300570] into tm-release. Change-Id: I03c4ada023121562e9b8ea071f0610f2ff61b914