Snap for 9311025 from 2c622db9e4242462e951d0261f5a06a355b53959 to tm-qpr2-release

Change-Id: I87c38fad045e61152e9824e3ae128293afc91141