Snap for 9133013 from c75e356bc12fd9c31dbde8752b2129a2d5c4a28d to tm-qpr2-release

Change-Id: I8f12b9bf4bd410c4085c0ccc4d1a5725b12df01c