Snap for 11579193 from e7abebc01d70b7eed93cdadfbbbfe33c32c304b7 to sdk-release

Change-Id: I0aa84e151ab9867694b3b7dc7031839eb8cbc6ef