Snap for 10306978 from 0026a2a5129972795e9658ef89a4ffac03d374cb to udc-release

Change-Id: Ia74b063eca78d73f7a43d39fae274212d75d6a37