Snap for 7160059 from a674254ce9645dd6deb8277adc5212580ac22200 to sc-d1-release

Change-Id: Ic1ae74ffe52d71329b2c02fe42b9c567a27688db