Snap for 8414339 from 2e2799dd657d16d4456be0674c21784be9114141 to tm-qpr1-release

Change-Id: I96565fd9b7266501e079e97a615e34fbcd97e41b