Snap for 8098834 from a72695f454192d888e024b7f642ad81396eaa706 to tm-release

Change-Id: Ic1f9741cdccc6ff8b7dfdffc022009863523b279