Snap for 6198741 from e792dd6e1f76d3e3991829c479fd8cd100cb55a6 to sdk-release

Change-Id: I2d4601f37e1625df47b3114ee67ebbd94b301e02