Snap for 8429780 from 3a5a803066aa8b5b9f72e2d559a411e2f2f9c125 to tm-d1-release

Change-Id: Ie5ea332380a24329d74508a189413347c503558f