Merge cherrypicks of ['ag/20961401'] into tm-qpr2-release.

Change-Id: Iad419a04b3c6bdba832006413e8503473b3b6054