Snap for 11566117 from 1c66c576c9f04f252e283b27e5683d24c09dee98 to sdk-release

Change-Id: I009ff8b46590ec5ba5234e36359ff230272d11ff