Snap for 8864221 from bb4d09b848593b369f708d98eac9357eda9dc75b to tm-qpr1-release

Change-Id: I2f46008532e5cad863352b72fb33e6280100e4e0