Snap for 6877830 from 9af0e281c2c9aa3f1a8a610851bb0d5f94762282 to sdk-release

Change-Id: I733b92113ffddcc6609a2c6f837841d3da0f9925