Snap for 9635940 from c1ce955fad2e40caafe990bd3f18cce4292c8ee0 to tm-platform-release

Change-Id: I481bb16ad9eb21772f930a1239333712e27a0b1e