Snap for 6686656 from 555ec8ac2c69ac3e1d91d5f9a3e2cf994156d3ad to sdk-release

Change-Id: I37461a03f585777119376cd893988aed422b74d2