Snap for 9550355 from a3cac8c9d79968772272fff97a98d4edaf3132c1 to sdk-release

Change-Id: I13e305f011fc52a90b808cca513a04be8d17a493