Snap for 7183507 from 05ca4d63c0b3a8e7a0212c04df24d0db4d7d15e4 to sdk-release

Change-Id: I3116a06f4ed52615cef98653a3785d9f3489d81f