Snap for 9424627 from 65b3e52c3ba934b71a361c2af46b289330d1ac50 to tm-qpr2-release

Change-Id: I748e704d904330feca5ce78ecb23982768b3703e