Snap for 8474975 from b31a100ccb0932b1e6c4eb337d5d9605a17b103e to tm-qpr1-release

Change-Id: Ib2cf45a3f3d45aa49c6b57d5500dfa1896cdb9f2