Snap for 9301146 from 31919fab23c5b7c682fdafc192737c098f17fb66 to tm-qpr2-release

Change-Id: I25d63b0afb679c1ff66f39cdf97f67fc9d8c04b0