Snap for 9470583 from 63a9e6071ef9220537110a66133d69e68f287834 to tm-qpr3-release

Change-Id: Iebb5f3b279639a26ee27a56e4b4557753e86b5fa