Snap for 9719949 from 7aa7176ad1e305a55832e03fb6e46cefc939db37 to udc-release

Change-Id: I9f237dc47f6ac7b39b330100af2bbacc461744a8