Snap for 9410359 from e259ffeba57c5a0e578fde2d88c5f34123492f95 to tm-qpr2-release

Change-Id: Iffcb05c27476c8c6765dcb1bdae259d2e8e014a7