Snap for 7444394 from fc89cdfce414e68a6aeac99bd0e32ce36eaede6a to sc-release

Change-Id: I9457fa5068dbd5a5a423a1c88c0ca6d6824a2700