Snap for 8554636 from bf043b21279859690beb16a00b1fb385b0d9754a to sdk-release

Change-Id: I3074a6d5216d089fa11f335ee90328a300815e93