Snap for 9541236 from 47656ac5f005c981db21f6c407dda33538ca042f to tm-d3-release

Change-Id: Ie1123e4b7c9ef14771ee4ab57146a644856d6669