Merge cherrypicks of [19099960] into tm-release.

Change-Id: I6fc4d6b37e52aec33bc5d6311c204931bcb44bc1