Snap for 8779833 from 2a8f89270f04d3a7b3f77f86e178d7c2edf48d89 to tm-qpr1-release

Change-Id: I143dc7dd9c06c2e6d22fba50fdba62e92fede1e6