Snap for 7183507 from 8f0c3b0f5aed85976c5e85be1bcf826aff7ea38a to sdk-release Change-Id: I56c766cc5df1adf5cbb3cc52952797e426790738