Snap for 9245572 from a9804cbd5a37b1d4ed70a23fea06ca11387e5df7 to udc-d1-release Change-Id: Ie6114ed1454103b8fda32ea9a0e7be64cef12511