Snap for 7269134 from 30ab38732c571957f9e174cfcdc7121e5331904c to sc-mainline-release

Change-Id: I60296b68716bbc6beb7254d81c435ccc7d029c91