Snap for 9402693 from 1729fc75c08ac084a9f73efb7e4ec57a47689913 to udc-d1-release

Change-Id: I4c205afd2a413363fa75776c1087bf9fa9c11f22