Snap for 9326426 from 4516af5e8eaf11fcb87be5440f7e78844675ac72 to udc-d1-release

Change-Id: Ibc2ab44b9f1900a2d3134b3df7325959583e6eb4