Snap for 9002697 from 8724cb6ab59aeacde6a2bca0454a59625f1db09b to tm-qpr1-release

Change-Id: Ia7ca37b639a2bf09c8d08175ebbdeae3f5c6f249