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

Change-Id: I7a7e7dcc8388dc05c6b16f2cfe62e5e003f8ba8d