Snap for 7149879 from 49536dc7b0c0b5acde212ce36e6a8ca50d5d7fe5 to sc-v2-release

Change-Id: I67602908913034aacba626ee30cae5ebbe37bc38