Snap for 9095712 from 264c7064e4742775b7601d78021dc412fd927d51 to tm-qpr1-release

Change-Id: I942f32fe10a0e7cae554fbdb0a326c548edc0d8c