Snap for 9410359 from d06e48b83e5c43e641f1e024bcb24c782c9dbe11 to tm-qpr2-release

Change-Id: I5d0c6d8df84446a0d8842025379c3ec88d7653e3