Snap for 9905984 from 938c7a66884155a90973b9923cab4172a3e15256 to udc-release

Change-Id: Ib49bfb5a9d01349c54f40707f8dab6c957e51ca5