Snap for 10929834 from d2027db59f74e44e50822d83afd2160902b23ffe to sdk-release

Change-Id: I011789a1fff98ed95593e94d671289f9baa6a50a