Snap for 9095712 from bf977832d1ceef80d46107bc8a287da5b40b4d57 to tm-qpr1-release

Change-Id: I64b1ac7aa9968fd5a8595e2a54f0402bf6996eb4