Snap for 7160100 from 0c51b91fe8b378860542f4fa214a88dc6bc14fac to tm-release

Change-Id: Ia993f4d5837f1cb6c0cec556ba6eafe6c2b7e6fe