Snap for 7110675 from 4f1685621b991185fcb8c05cb5dc33f47ee10ec4 to sdk-release

Change-Id: Idbb97cec78df98de1b8359bebc3eb264e4978ce6