Snap for 7160059 from 4b0cb10d52977c0f0e5cd0631107e18b0b5bb69e to sc-release

Change-Id: I9ba0909c418f1140da0ece04e193e48c89b79e88