Snap for 9385690 from 613f3459ed7c895128233a4e9010247a9dbac7c7 to tm-qpr2-release

Change-Id: I9ebc8109a4fcc7133cc8279293f0804fe80a655e