Snap for 9463735 from 63a9e6071ef9220537110a66133d69e68f287834 to tm-qpr2-release

Change-Id: I5f340aa16bb300baec09bd65b3949bea5c98781f