Snap for 10316917 from a4968151cd12b76fca0f25fe20cfd3a52f371fde to tm-platform-release

Change-Id: I96d9b81b6991867885b710c88ffe2737143f4fec