Snap for 9163457 from 86a80af9583d0fee6f59a04d27643063c7d13dd4 to tm-d4-release

Change-Id: I60d0697890b38e6e5b4c46de9bfbdb91a4ad41a7