Snap for 7183507 from e616910155313e20013a15e5d322b1ca37cc9f2e to sdk-release

Change-Id: I75f06be2c694ffbd4bc68442665d4a0797f2ede0