Snap for 8414339 from be5ec692422194242d5d696c3eb40017022b137d to tm-qpr1-release

Change-Id: Ia0874edbcb90ff46b20fa44dbc0a898e561180dd