Snap for 13235685 from e149a49c7dfbeb8f94b746321f6ea01bcb66a859 to sdk-release

Change-Id: I9f9f704895921316816e98fc3d963f390955be74