Snap for 7349429 from b7c6f7607bc9dd829207eddc218c4bbafa91cb52 to tm-release

Change-Id: I09b98fd22fd08a47969297dc79564ae973b34658