Snap for 11962796 from b90de4eaf41af167619f40069e877372b1e32778 to sdk-release

Change-Id: I13c8a3f694ed9cb4e678c883b07d24397c257a04