Snap for 7110675 from ddf88516d4281700cf32914ad5a7664adf2b7497 to sdk-release

Change-Id: Ib3e9882162817fd862b0ba1444a2bcaa95230b81