Snap for 9239618 from ab56fe40c2111540414c5422ff4c2fd1596dd43e to tm-platform-release Change-Id: Ie92078737c0ba9d531c5255266c0c3998320592e