Snap for 8005954 from 373b1ceccea5e41f61f492852762203bb12b69bd to sdk-release

Change-Id: Idb1695e6d18c6f7e6d99fa9f88d2fdb2a26f148e