Snap for 6877830 from 89b6626d5d9f5968da53d107e7f6c2666ef5400f to sdk-release

Change-Id: I5d02fcba8287a3f455fcd4191dce1112305ab276