Snap for 9133013 from 903764749565739fbab458382758762af4a8c130 to tm-qpr2-release

Change-Id: I2ef8534096bba7d0c3f484498b727b05c499d0d0