Snap for 6877830 from 8bcee4db7da364d9dad5bb88b8ba33c881fa74d7 to sdk-release

Change-Id: Iaf284dc38159d31d3585334f638401bb8225f768