Snap for 9550355 from 506c1a0d177b3c646188a2cd8a5f9934f1acd8ff to sdk-release

Change-Id: Ic87db338583327f49cf1dde6552f8b852fa2730d