Snap for 11541002 from 336605067d466b7f9c01fac455fa8ef94176cdd5 to sdk-release

Change-Id: I7034a62dd67f180291d418a1d57f16b95f368798