Snap for 7343852 from b5540afb16076d2466c8c99ab5ad81f97d3d6f6e to sc-mainline-release

Change-Id: I968b125734492ddb6aa254af41d3c86cd93ffd07