Snap for 11541002 from 7ddad402f1305c9bc9f6aed003e5ece7814a80c8 to sdk-release

Change-Id: I96b4fddc9803ccfdafd3eedb3f464a20a096e4ad