Snap for 7183507 from 97c7927a586a60c106f25286b9d48bd108b7a212 to sdk-release

Change-Id: Ib22ae76d7266ba9c93e9b52c413cfaefb8ca0bb6