Merge cherrypicks of [19693250] into tm-release.

Change-Id: I3c61f13d32a3166a3736b0d447e44479eaaa6739