Snap for 7375516 from b605d1d73cd0f10c82b14e9ccbbbce605a077f4f to sc-release

Change-Id: I3af6ae4c312fa63bd3050da8d141d38296774f48