Merge cherrypicks of [19571152] into tm-release.

Change-Id: I519870f5f4f451405841d628d43359a0fbe530f1