Snap for 6686656 from 7d6b8d2a85686d1bab9fcab190199ff339dabbba to sdk-release

Change-Id: If5f16bb07666cec2a984765fc2b019684437bb0e