Snap for 11541002 from 02716d134676571e8572d7de85022f49eb39b0cb to sdk-release

Change-Id: I79e8f78a0b904d74021084ec0500c41dd8237c37