Snap for 12349386 from 4b9c6d91573e8b3a96609339b46361b5476dd0f9 to sdk-release

Change-Id: I916d79bf74fd7f0aad8f9ef1e6755ea04355aeb8