Snap for 7615884 from 64934187b4c26e293d737191266160957582dcae to tm-release

Change-Id: I0cde81197d390f2c2adae6183467d43ded390568