Snap for 9966400 from 5143fb52b848db5a76a5715d9b18fa4a44b1ec3c to udc-release

Change-Id: I503b90ea845fb164abf9794320094eb1f30e2846