Snap for 8522600 from 436980d31c99bdee3c794e26e662e885eba928d6 to tm-release

Change-Id: I35388fa85b1e14024961e02771a7a0ff7eb731e7