Merge remote-tracking branches 'yuyuyu101/omap-cache' and 'dachary/wip-8254' into wip-sam-testing-2