Snap for 7325096 from b3d04ce05ee2993da60f476f0c1f609ecdd26b3f to sc-d1-release

Change-Id: Ie8a9f99bdb44f1ca0decffafa54d198b58e99f16