Snap for 9070148 from 59b2a22228c392ca4937fb2c221f4e8a82a5b106 to tm-qpr1-release

Change-Id: I92db89d5c562991e310c14be4850a9e06b4f38fa