Snap for 7183507 from 6811c422974b91d084899f25555a469d9af61623 to sdk-release

Change-Id: I2ca478d80b5115157b546a4f23e232c7c38be725