Snap for 6686656 from aa8176185e72a346b359a6287972070f471146d8 to sdk-release

Change-Id: Ibbb52f8a23b05e656401ff046384d9d6df5af020