Snap for 11541002 from 9f7e1e2335cc9fe92bbce8fa2acb77717998da25 to sdk-release

Change-Id: I7dfb267f211c0526fb30f88bf6aaa98e1b587b9c