Snap for 8362632 from eec261ab0efde0ef0db94bc1a6096ab062d65089 to tm-release

Change-Id: Iebfef62a47ee1890aee2ad33e8353c2d1f0a66fb