Merge cherrypicks of ['ag/20690268', 'ag/20877927', 'ag/20965081'] into tm-qpr2-release.

Change-Id: I9e4cdb6a9a8b795c6edae0ac52b693020f5f8eee