Merge "CachedAppOptimizer: Use correct types for get[up]id()" into main