Snap for 9931682 from 1cabbbf8fd000f495bae04a0394d9c23e2e027da to udc-d1-release

Change-Id: Ic97ee0b9a5d8e8e80cb5d156d4bbd39b97aa8442