Snap for 7482983 from 0031c2c122b17209d04d4fc83c8331a87003047b to tm-release

Change-Id: Ifce403c21f3694685399cf6907f870a32366e600