Snap for 8572535 from 13a8c20d600f46dd73c5753776dc690a308b41e9 to tm-release

Change-Id: I28643cb3b470c191a5a134faf5303a393983e909