Snap for 9239618 from b395fea5bfa4b9a1d5622971ab51af4f9309db41 to tm-platform-release

Change-Id: I2f7830e5d005c630c36ee1c5c84e2084a5f58d23