Merge "Fix for simulator build break"