Snap for 10214594 from 792f44845e375a336f3b60dfeff086e67a335464 to sdk-release

Change-Id: I97294f8c956d3127f033e6ef1ed4b66f7f1d39bb