Snap for 8941678 from b151fd4477660e115825b94ec8aa1c4709b0fcf1 to tm-qpr1-release

Change-Id: I0b9896482dc681cd337c4450a6b1f3d6313f5f14