Snap for 10929834 from c497257e0a6a69e70793e984e5ccc1420288ee95 to sdk-release Change-Id: I556a57aea96a0ee4bee11cc11f037105a44ec64b