Snap for 9190355 from 24da40ab85db95aa48adbf89c8c2159e32320360 to tm-qpr2-release

Change-Id: I1a79f9ccffd8e46b4689a7cc989a6131e5a6fe09