Snap for 8414339 from 1b1dcfdeb3db1e3ee52db03caf6c89b5fdee1429 to tm-qpr1-release

Change-Id: I8e6cb2ba87ff20279ad700b4233339a347b02250