Snap for 7160059 from 6a4d737b0415632df2c4f1c6a517e10c6fbdf14b to sc-d1-release

Change-Id: Ib45d1e1813e6bbfc3c56d6ac68847c0dba1db0b5