Snap for 7269134 from 710beab0532ccece1055fb39c39509c17e68f6f3 to sc-mainline-release

Change-Id: I666eef48f74e9b5ad8d8cc4119f14b178795a0bc