Snap for 11580214 from 0b80bfc502fef7ba6feeb63a1da028aa633b4429 to sdk-release

Change-Id: Idd6b6224692a8aa73867b6c6ad1a1e5d71180ade