Snap for 7237786 from 24cca7777b4b24d3473cecc1819c1bc1095d8fc2 to tm-release

Change-Id: I3012f67d3b6da3408cf070b8a960da4bbd4685dd