Snap for 9088299 from b309a89e4afdc678a7f767ca55dd5de4ce6dfc93 to tm-qpr1-release

Change-Id: I4d7b5b75f9f1145cceb7cc5c1ba3b21cc5658235