Snap for 8599125 from 1f444452ca3edca4404b4732b18b98eed33ca083 to tm-qpr1-release

Change-Id: I3d18e5d24ac41ac614a14034a784bdbfc2d73179