Snap for 7302914 from d320090891ddfcbbc7473f984015e5897882472c to sc-release

Change-Id: I5f51401d19845ee7d5e987a6817e1253282cb298