Snap for 9682271 from 2ba134eafe21b713e6187ee6bce995637a0b425f to tm-qpr3-release

Change-Id: I7b618241a79d5b77f18ffa98ddcee41fb90f0e16