Snap for 8183382 from 2d81804ddd080d9638e798716191b368141ea259 to tm-release

Change-Id: I87cd11f4a6908cba749f5dcc34be5cf816bd4ed1