Snap for 8050871 from 56e7a9b63e9edc4eb6c29ade3d93dbad54b4a261 to tm-release

Change-Id: I21cea0f2ffaf902d85264cc1d6bf8d64fa8c4741