Snap for 7409432 from 0309432c015867a387f99a4a0f28af86a8a1600c to tm-release Change-Id: I8faf15e10ef0859ef2e9243e81256c1ec9d2e23d