Merge 7xx-iosplit-plat-merge with omap-fixes