Merge cherrypicks of [19291911] into tm-release.

Change-Id: Ice856e7ed232f1547f7bb4b4e9f2905794f2366e