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

Change-Id: I08dfc9e288bee6c820d5f1979697cd4431e56d5f