Snap for 11541002 from 16aaed4fde9cb98a08ac15ba7f0b5d5e3ab87832 to sdk-release

Change-Id: If9a594cdda3fe96dd03880bb23ede4f641a5ca87