Snap for 7482983 from 595670d550ae460ed190011e282b00df2f579ebc to tm-release

Change-Id: Ib576d2f0c085ae76855d17dffb9c835e69380768