Snap for 8005954 from 7132b01d1e71be9dbca5a716c8e06ab1f59e0038 to sdk-release

Change-Id: I00e81b44d04c742904c86394d5c27971dbc79f3c