Snap for 11790536 from c4b7a5a7da0b9d905cc77b567c53d19bf8a0ef91 to sdk-release

Change-Id: I9bd55d8a82897b9ced5eeeda345bcb7bb35c915c