rmi and build cache miss performance improvements Upstream-commit: 56ef47e881359776638903ef1636cb7030ca5eec Component: engine