Snap for 8005954 from dbcbbb2c9aff4dcbf14814eb01d8958147b4ca2e to sdk-release

Change-Id: I11ac11b4e5c71f3d1818d8ef773fe2644e8c9484