Snap for 11841552 from 705ae38c8b58c4ecfc4f7451ac700489270c6b02 to sdk-release

Change-Id: I7b410dfb6e53417103023877733d76aab597eaa5