Snap for 6704724 from a0817ae56a6db7d6d981abecaf32db04392e6120 to sc-release

Change-Id: Ic1bcb3f22470352925db05e29a5cc815a651163f