Merge "Fix for simulator build"