Snap for 8554636 from 0dfb926ca0a2c37347c1a2794a6082a122c6d1de to sdk-release

Change-Id: I90d1722066a612a586c8d48acb58eaf02b1c9e26