Snap for 7205268 from e0434f1ad38f6b1a645b6a68cc03c4983a81e943 to sc-v2-release

Change-Id: I289eead13f742872aac83d4aaea565a73c07c06d