Snap for 7514518 from 2a512b4a163b8cbe846f0aaff1ef50d978ea3b79 to sc-release

Change-Id: I7e23ca195b326734523c3102c9e64cc696deae2b