fetch merge updates

Change-Id: Ifd3d79c53539edf9b766cddc9cb4df90d6806ade