Snap for 9397200 from cb40afe20ea409afdbd98faa36c177e148b8338a to udc-release

Change-Id: I8fc5f1081433ac4ecf1ec46165d07b31224f6a91