Snap for 7418083 from 161027dc3e23a3ec7461a9303fbc6ff05ae45378 to sc-v2-release

Change-Id: If1c6b288a7719b6d1e55d65901c27be5953f8312