Snap for 7110675 from df6961d7374cd12496c6e1e868f19a8d39e013db to sdk-release

Change-Id: If44c3f4331c8b333c165209f9636cfa402752fb7