Merge cherrypicks of [19911971] into tm-release. Change-Id: I3d5c2d73c7d4115ac6be7b4884b75aee4243c6f8