Snap for 6405781 from 018214dd8e6eaacfad0157fc71212be4d0f1efc0 to sdk-release

Change-Id: I9ff688c317c7e5f33a70235dde79cd30e55f079c