Snap for 7655068 from 1ee4a513cd0f447e969dcec99e9ef2d7ae66fdd7 to tm-release

Change-Id: I4091b9ab490dc9bb3157ce2b8e2694c85b65c618