Snap for 7183507 from dd75778cda0e7c2210e2946283588419344e7d36 to sdk-release

Change-Id: Ie6e23632fb6322eca6259d9a6cc1cd191015a176