Snap for 9250849 from 0394106825f98eccb83924746db9424f4f1b522e to udc-d1-release Change-Id: I61218e848e4801c40fb3bbdacbe6b442f61e7ddf