Snap for 8005954 from 0ae9e79ad7a11bac7b27fb5b8b4b00cd47dca56c to sdk-release

Change-Id: I6543cf0d32016d45d7df095fb18dc35613ae6941