Snap for 8378790 from 76f509766ae31d93f33873f6a07372a9d543f00d to udc-release

Change-Id: I4f1f7e26ba13c5666d71452e64a5398cdc868933