Snap for 7213262 from 5c15f84cf017853d524cbd72a419b1b67f8241aa to sc-release

Change-Id: I01bd66372a4f543ca9cc7d95776a815f745f815e