Snap for 7160059 from 6025bed211476978df45f2b432d8a8f597c1b284 to sc-d1-release

Change-Id: I6807639373745eb843e8a0d96100faa432f0dbf6