Snap for 9550355 from 06ce8d348f9145e41e8f52ff9f83470fe3563084 to sdk-release

Change-Id: Ia78b9306bfbf4764785edc5aeda8d02b4e9878a6