Snap for 9075033 from 42126998cf9185b1602d3669367e63ca50e48085 to tm-qpr1-release

Change-Id: Ibe9d3de7816dba2d37ad479bf7156fb1ae1bb803