Snap for 7821744 from 7d1babaa9675195002b249d4bfac5ddf07d8e87e to sdk-release

Change-Id: Iaec7f9585e00b1d5dedf62986068cf400939ec1a