Snap for 8611520 from 4330a931c3294c35c74c67e69156516098742015 to tm-qpr1-release

Change-Id: If952e0753196b776e704e42cdd0f98b4b92628b2