Snap for 8492635 from aac800dc0096c5016bb379c52084fa5afb107d2c to tm-release

Change-Id: I65ea579a24e4061f45e9ac5b513436108eac3cec