Snap for 11904077 from eab9abe11108315a75fcbd52d38bf6231b419a41 to sdk-release

Change-Id: I962042bef14e9de69c142399ac8173958879ef54