Snap for 11541002 from 621e9f4e191d643a36c03dab0bf9639a5f8b8e12 to sdk-release

Change-Id: Ieebb6bff935a65e6d440dbc34b32a5124c1459e4