Snap for 6877830 from f94644fe3d680095d6ac38d8333e76d3c64841ee to sdk-release

Change-Id: I98a77c7c6768be20af639d3d4c0e4c192d3ff6bf