Snap for 8656240 from 45500c4e46db324e99cc3ef03c668ce2ecc732fd to tm-release

Change-Id: I0f33a52946037874913cd245844f128ab0e3c3e3